From 0df8f2e3e7f7cb40af97fe7407359d6561b82821 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 6 Feb 2016 21:25:49 +0000 Subject: [PATCH] hwrng: n2 - Attach on T5/M5, T7/M7 SPARC CPUs (Closes: #809815) --- debian/changelog | 1 + ...-n2-attach-on-t5-m5-t7-m7-sparc-cpus.patch | 37 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 39 insertions(+) create mode 100644 debian/patches/features/sparc/hwrng-n2-attach-on-t5-m5-t7-m7-sparc-cpus.patch diff --git a/debian/changelog b/debian/changelog index f343f1d34..4adf313cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -136,6 +136,7 @@ linux (4.3.5-1) UNRELEASED; urgency=medium module (Closes: #813640) * debian/copyright: Add licence information for drivers/crypto/vmx/*.pl * udeb: Add hid-logitech-hidpp to input-modules (Closes: #796096) + * hwrng: n2 - Attach on T5/M5, T7/M7 SPARC CPUs (Closes: #809815) [ Salvatore Bonaccorso ] * netfilter: nf_nat_redirect: add missing NULL pointer check (CVE-2015-8787) diff --git a/debian/patches/features/sparc/hwrng-n2-attach-on-t5-m5-t7-m7-sparc-cpus.patch b/debian/patches/features/sparc/hwrng-n2-attach-on-t5-m5-t7-m7-sparc-cpus.patch new file mode 100644 index 000000000..972989a03 --- /dev/null +++ b/debian/patches/features/sparc/hwrng-n2-attach-on-t5-m5-t7-m7-sparc-cpus.patch @@ -0,0 +1,37 @@ +From: Anatoly Pugachev +Date: Tue, 26 Jan 2016 00:19:02 +0300 +Subject: hwrng: n2 - Attach on T5/M5, T7/M7 SPARC CPUs +Origin: https://git.kernel.org/cgit/linux/kernel/git/herbert/cryptodev-2.6.git/commit?id=c1e9b3b0eea12899b7749571af21cc60822cf2b6 +Bug-Debian: https://bugs.debian.org/809815 + +n2rng: Attach on T5/M5, T7/M7 SPARC CPUs + +(space to tab fixes after variable names) + +Signed-off-by: Anatoly Pugachev +Signed-off-by: Herbert Xu +--- + drivers/char/hw_random/n2-drv.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c +index 843d6f6aee7a..3b06c1d6cfb2 100644 +--- a/drivers/char/hw_random/n2-drv.c ++++ b/drivers/char/hw_random/n2-drv.c +@@ -743,6 +743,16 @@ static const struct of_device_id n2rng_match[] = { + .compatible = "SUNW,kt-rng", + .data = (void *) 1, + }, ++ { ++ .name = "random-number-generator", ++ .compatible = "ORCL,m4-rng", ++ .data = (void *) 1, ++ }, ++ { ++ .name = "random-number-generator", ++ .compatible = "ORCL,m7-rng", ++ .data = (void *) 1, ++ }, + {}, + }; + MODULE_DEVICE_TABLE(of, n2rng_match); diff --git a/debian/patches/series b/debian/patches/series index a0c223a45..b53c5d40f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -141,3 +141,4 @@ debian/usb-fix-abi-change-in-4.3.5.patch bugfix/all/rt2x00-fix-monitor-mode-regression.patch bugfix/all/pipe-limit-the-per-user-amount-of-pages-allocated-in.patch bugfix/all/user_struct-fix-abi-change-for-cve-2013-4312-fix.patch +features/sparc/hwrng-n2-attach-on-t5-m5-t7-m7-sparc-cpus.patch